Revision: bazaar--devel--1.2--patch-31
Archive: robert.collins@canonical.com--general
Creator: Robert Collins <robert.collins@canonical.com>
Date: Tue Feb  1 11:57:26 EST 2005
Standard-date: 2005-02-01 00:57:26 GMT
Modified-files: commands/apply-delta.c libarch/inv-ids.c
Modified-directories: {arch}/bazaar/bazaar--devo/bazaar--devo--1.2
    {arch}/bazaar/bazaar--devo/bazaar--devo--1.2/thelove@canonical.com
    {arch}/bazaar/bazaar--devo/bazaar--devo--1.2/thelove@canonical.com/patch-log
New-patches: jblack@gnuarch.org--2004/baz--applydelta--1.2--base-0
    jblack@gnuarch.org--2004/baz--applydelta--1.2--patch-1
    robert.collins@canonical.com--general/bazaar--devel--1.2--patch-31
    thelove@canonical.com/bazaar--devo--1.2--patch-2
    thelove@canonical.com/bazaar--devo--1.2--patch-3
    thelove@canonical.com/bazaar--devo--1.2--patch-4
    thelove@canonical.com/bazaar--devo--1.2--patch-5
    thelove@canonical.com/bazaar--devo--1.2--patch-6
Summary: merge from rocketfuel, and [naughty] touchup some inactive code
Keywords: 

Patches applied:

 * jblack@gnuarch.org--2004/baz--applydelta--1.2--base-0
   tag of thelove@canonical.com/bazaar--devo--1.2--patch-5

 * jblack@gnuarch.org--2004/baz--applydelta--1.2--patch-1
   Fixing up apply-delta to work with three way

 * thelove@canonical.com/bazaar--devo--1.2--patch-2
   merge in 1.1 and 1.1.1 release changes

 * thelove@canonical.com/bazaar--devo--1.2--patch-3
   .orig file support

 * thelove@canonical.com/bazaar--devo--1.2--patch-4
   many merge performance and memory adjustments

 * thelove@canonical.com/bazaar--devo--1.2--patch-5
   memoise the arch cache path, and combine the machine with that for memoising my-id

 * thelove@canonical.com/bazaar--devo--1.2--patch-6
   Fix up apply-delta -t

